From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 12 Sep 2008 15:45:37 +0000 (+0100)
Subject: x86, shadow: Add new location of Linux direct-map to the places to
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14110^2~9
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=bb401a4e5cfbed36b9c7a220e6f8ad60ecbd2354;p=xen.git

x86, shadow: Add new location of Linux direct-map to the places to
look for writable mappings.

Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
---

diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index c6bbc73086..d5e4215926 100644
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -2385,11 +2385,13 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn,
                           + ((fault_addr & VADDR_MASK) >> 27), 3); break;
             }
 
-            /* 64bit Linux direct map at 0xffff810000000000; older kernels 
-             * had it at 0x0000010000000000UL */
+            /* 64bit Linux direct map at 0xffff880000000000; older kernels
+             * had it at 0xffff880000000000, and older kernels yet had it
+             * at 0x0000010000000000UL */
             gfn = mfn_to_gfn(v->domain, gmfn); 
-            GUESS(0xffff810000000000UL + (gfn << PAGE_SHIFT), 4); 
-            GUESS(0x0000010000000000UL + (gfn << PAGE_SHIFT), 4); 
+            GUESS(0xffff880000000000UL + (gfn << PAGE_SHIFT), 4);
+            GUESS(0xffff810000000000UL + (gfn << PAGE_SHIFT), 4);
+            GUESS(0x0000010000000000UL + (gfn << PAGE_SHIFT), 4);
             /*
              * 64bit Solaris kernel page map at
              * kpm_vbase; 0xfffffe0000000000UL